Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 31 Oct 2011 19:53:29 +0000 (12:53 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 31 Oct 2011 19:53:29 +0000 (12:53 -0700)
commit07eccbdfacc1052fb408c74c845a8c04a18c6200
treea4be0474747f6d0bfea8cd8e1ddd0d6c1103421a
parent6f2531694a03f63ec4f9ca20f326f2705977a343
parenta344601e9c741f1cfb58eb02df3a8add4ce5c129
Merge from trunk.